From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 13 Jul 2023 17:04:20 +0000 (+0200)
Subject: popupMenu: Hide ornament by default
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~337^2~1^2~75
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6bcb4f310ff4e63d02a1c3df073de264566f7eef;p=gnome-shell.git

popupMenu: Hide ornament by default

We have always defaults to an empty ornament, so that menu items
are always aligned, even when radio items are used.

However radio items are fairly rare, so most of the time we end
up with an extra margin with no purpose. The design team now
prefers radio items to only align with each other, so that regular
items get the expected margin.

Change the defaults accordingly.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2843>
---

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 7b876ed24..ff503a142 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -96,7 +96,7 @@ var PopupBaseMenuItem = GObject.registerClass({
 
         this._ornamentIcon = new St.Icon({style_class: 'popup-menu-ornament'});
         this.add(this._ornamentIcon);
-        this.setOrnament(Ornament.NONE);
+        this.setOrnament(Ornament.HIDDEN);
 
         this._parent = null;
         this._active = false;
diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index 4ab716a0c..8588dbb87 100644
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -257,7 +257,6 @@ class BluetoothToggle extends QuickMenuToggle {
             ellipsize: Pango.EllipsizeMode.NONE,
             line_wrap: true,
         });
-        this._placeholderItem.setOrnament(PopupMenu.Ornament.HIDDEN);
         this.menu.addMenuItem(this._placeholderItem);
 
         this._deviceSection.actor.bind_property('visible',
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 000279e85..eee89d021 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -244,7 +244,6 @@ const NMSectionItem = GObject.registerClass({
 
         // Turn into an empty container with no padding
         this.styleClass = '';
-        this.setOrnament(PopupMenu.Ornament.HIDDEN);
 
         // Add intermediate section; we need this for submenu support
         this._mainSection = new PopupMenu.PopupMenuSection();